Fixes #43... or so I hope