[TO_STAGE] Fix for bug 997008