fixing #31