Fix FORGE-1500

It fixes https://issues.jboss.org/browse/FORGE-1500 but I'm not sure if it doesn't mess anything, maven and gradle tests run fine after that change.