Bugfixed in merge