fix issue #8