Latest fixex for PR