Data getter bug fixed