Nearly fix it