-FIXED- water parent issue