implement feedback of #41