Fix for the bug 990481