Probably fixes #12. :grin: