Fix for https://issues.jboss.org/browse/RTGOV-531

https://issues.jboss.org/browse/RTGOV-531