ListCommand fix