Fix Delay Bug