bugfix after merge