Fix issue in 9 cases