Partial fix for: https://issues.jboss.org/browse/RTGOV-412

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