fix bubble issue