Bug fix in Fixed module, if no unfix point reached, onUnfix/onFix constantly fire
Merge branch 'develop'