Fix to P1-02