Erin's fix