Fix odd EDR scenario bugs William found [978]
Merge pull request #71 from tommyjasmin/master

Fix odd EDR scenario bugs William found [978]