major fix errors resolver