Bug fix for simple water