fix issue 16
fix issue 17