Solved issue #2