(Hopefully) fixed tick()