this is the fix we wanted all along