solved issue #7