fixed all data type issue