FS-5549 regression
FS-5819: don't assigne variable to itself