[NGeneral] Fix #210