Solving issue #3