fixed bug 522