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

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