Continuation of previous fix