fix issue #7