fix issue #81