Fix of Delay Problem