HV-818 static methods overrides fix