NGL got broken, adding conservative version