Fixing #122