Attempt to fix the issue #139.