fixed https://issues.jboss.org/browse/WFK2-312