Should fix #58
Totally untested... like all commits should be!

Signed-off-by: Suki <suki@missallsunday.com>