fix the legacy