bug fix issue #4