Fix getter data for new logic