Fixing the issue #28.