Fix to previous fix