Fix FORGE-1023