Fixed controls resetting to early...