some exceptions fix