bug fix issue #11