Fix width calculation finally