JDF-221 fix

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