Better detect ngos (hopefully)