Fixes danielgrosvenor/me#17 #26

Closed danielgrosvenor closed 4 years ago