fix of critical bug