Fix for: https://issues.jboss.org/browse/SRAMP-386
Merge pull request #387 from EricWittmann/SRAMP-386

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