Updated for Yii bug #2680