Solving issue #3307