We need to do that in other areas of base.php as well. I'll make the changes.