[issue-364] Separate vars