resolve the recent issues