exception fixed
exception fixed