Same bugfixed for other files