Aaronchch/heli issue 934

This seems to sort the stick issues.
I'm not too good with git so any suggestions are appreciated.