Fixing command_get_main_fn