Issue #41 removed in one place