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

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