Fixes (hopefully) #46