#180 bugfixed