I would suggest(if you haven't already) putting his water up after 6-7 PM. Or after he comes in for the last time/before bed.