Fixed FROM clause