bugfix after merge, manual merge was needed