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

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