Title overflow issue fix