Completely fixes issue #33