Fix FORGE-774