Bugfix, because of failed merging