CONTRIB-5283: Fixed