CARE #10: Fixed showing data issue