Bugfix (merge typo)