Fix bugs Type