try fixing #22