https://issues.jboss.org/browse/MSC-136