fixing #41