fix issue 116, 119