Fixes #46 along with f0c89f6