fixed bug 7521 7456