as suggested in #41