Fixed cli entry point