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

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