Updated for Yii bug #2680

Fix for issue #2680