fix issue #137