improved up/down handling of bubble