bug96 fixed