Solved issue #7