fixed bug 496