Fix bug for bubble