Up tp PG 3.5 + &rsqo small bug