fix issue7