Bugfix on variables containing numbers