Solved issue #3