fix issue 106/5,7