Fixing #22