fix naor