hopefully fix issue #6