HHH-8683 Fix incorrect @Override positioning