bug fix issue #69