Fix for AUTOGENERATED SQL FROM Clause