Remove special case from bubble as well.