Better fix.
BugzId: 3357