Fixed logic on brushes