fix issue #37