fix issue 190
fix issue 191