Quick fix for https://issues.jboss.org/browse/MODE-1832