Merge "Fix bug with smaller width bigger size" into main