bug 37 fixed