Bugfixed last commit