(#1487) - few more variable tweaks
(#1487) - extra get -> put