fix
NS logic