Issue #26 bug more or less fixed