Fix legacy