Fix according to spec