Can't dismount over shallow water

Added to big bug report