Fixed the time delay problem