Data type bug fixed