Fix brand violation bug