Fixed Data bug