Merge "Improve logic when flinging up."