Fix for JDF-267

https://issues.jboss.org/browse/JDF-267