Unbreak command line API