Step C fix