fixed bug 510