fix issue #424