Fix #114
Merge pull request #115 from FlowForwarding/issue114

Fix #114