fixed data condition crash