Continuation of the fix