Fixes https://issues.jboss.org/browse/ENTESB-2033