Fix wrongly merged commit @Override problems