Not sure how these have been missing for so long
Merge pull request #457 from avoidwork/edge

Major fix