Fixed double ticking issue

* Fixes #35