Bugfix: variable name collision