Fix a bug related to the first tick not being called