Bugfixed issue #88 (closes #88)