Issue #71

Fix regressions