fixes #93, or it mostly should.