fixing #22