Fix timing problem