Starting the fix of the issue #17.