Improve non-continuous brush support