fixed bug 54