fix issue #33