Touched up small timing bug