Fix ngp-16 and ngp-13