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

https://issues.jboss.org/browse/SRAMP-420