re-fix of issue #149