Fixed the data types