Hopefully fixes issue #2.