[TO_STAGE] Fix for Bug 880699

better regex