Attempt to fix issue #90