Even smaller commit than Peter's one