fixed issue7