Bugfix: error in var expand