Data Type Fix