Fix Peter's code.