issue #45

fix issue #45