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

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