Fix oops in shift commands