hopefully fix issue #81