fixed bug 23