Fixed for CLI (enabled only if HTTP request)