fixed ntn bugs