Updated previous fix