Bugfixed after merge