fix legacy