I also don't like these mechanics, especially when you swim and fall from a chopper^^.
They should change it as fall damage.