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

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