Fix delay problem