Timing fix

Timing is still being weird, but this should help (?)