Tweak to apps/cli/handlers/index.php