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

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