Ben's fix