fixing #136