Fixed issue related to datatype