Fix for fix of issue #122