Avoid having virtual methods where not needed
2 files changed