Fix the fix of issue #26