Fix the fix for duping water bottles.