#15: supporting ticks
fixing conflict