Solving issue #3077