#8 bugfixed