Fix command return