Continuing previous fix