further improve previous overview class issue