Have you tried moving to a water bottle?