Fixing small timing error