- move code back into tick method, closes #1493