hopefully fix issue #300