Fix null FROM