Fix water transfer bug