Data getter fix