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

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