[NGeneral] Fix #82