Make bubblescatter robust