Optimize time ticker. Fix #2