bug fix re issue #1