Close of issue #122