Issue 151

Should be tested with SCION.

Fixes https://github.com/jbeard4/SCION/issues/151