fix issue #22