Fix reversing and timing problem