actually fix timing