Fix Bug with Delay