bugfixed last commit