Legacy fix