Solved issue #2.