Review Fix and NP safe handling