Fixed potential issue which could uneven mapping