Change #170: loop Bucket -> Water Bucket