https://issues.jboss.org/browse/ARQ-1841