REDDEER-56: Fixed