Better fix for bubble text displayed