#156 bugfixed