CB-5202 fix from lubogospod