revert #36; fix #41