Fix API violation