Fixes FORGE-1306