fix issue 384
fix issue 384