Fixed command wrapper to work properly.