Initial fix for FORGE-1488