Modified and fixed auto correction