Fix for https://issues.jboss.org/browse/DTGOV-230