Hot Fix on a text selection bug