Solved issue #6