fix issue #39