Should Fix NEP