bug fix issue #13