fixing #37