FORGE-866: Minor fix