fix issue #138