Improves the fix for the bug 1038