resolve the latest issues