Fixed the fix of the problem