fixes #86 (severe bug)