Fixed previous fix