Fix for bug 1018450
Merge pull request #3879 from abhgupta/stage_fix_1018450

[TO_STAGE] Fix for bug 1018450