Improvement related to the bug 13504