Bugfix with numbers in variables