fixed bug 506