bug 80 fixed