fixed timing problem