fix issue #35