Fixing pull request EllisLab/CodeIgniter#2355