Fix for https://issues.jboss.org/browse/SRAMP-490