Fixes bubble, breaks tests.