fixed bug 555