fix issue #31