fix issue 368
fix issue 368