#172 bugfixed