Bugfix expand variable definition