Solve timing issues