OK, seriously fixes issue #90