Fix for the issue #4