Fixes #934 (tests needed, I am not at all an HELI flyer!)