bug fix + close issue #1