Fix FORGE-1427 issue in forge.bad