Fix some bug in text - V2