Select `from` fix