Another step toward fixing FORGE-940