Fix FORGE-1500