merge bugfix variable renaming