Fit for older versions