Fix for the issue 3541