fix bubble rendering

Change-Id: Ice371673554a88b69866179b6b16944d6171e45d