Fixes Issue 138

https://github.com/jbeard4/SCION/issues/138

Should be tested with https://github.com/jbeard4/SCION/tree/issue-138