[NGeneral] Fix #223