Solved issue #1