should fix issue #84