fixed bug 83