Override fix