fixed the issues caused by some merging