Possible fix of issue #3.