Re-fixed silly bug in timing logic