Add a proper shouldtick handler