* Resolved an issue in recent merge.