Quick fix of issue #3