v2.4 fix bug in set FROM