Refine the overriding logic
Avoid duplicate overriding (see #30)