Revise the unit case, too