- bug 6497 fixed