FORGE-1565: Fixed