Do not surround value to assign with c() if that value is a scalar
(cherry picked from commit 99d8f3e)
Sorry, missed a paranthese
(cherry picked from commit 6c32e00)
Sorry, missed a paranthese
(cherry picked from commit 429a45c)