Bug 37 and 38 fixed