aUUUUGH

OK, finally solved this stupid click-to-disengage.
Merge pull request #26 from mechaet/master

aUUUUGH