Bug fixing.
Merge TFS Changeset 1978