Fixed bug for dynamic var names