speed up for localization
fix conflit after merge