solved issue #107