issue 3342 fixed (testing needed)