Critical bugfixed