exception fix's