Bugfix for getting booted for floating in water. Closes #1545