CD - I agree with you.
My solution only worked if the steps are done in the reverse order, otherwise 36A becomes a non-word, either before or after the second step..
I suspect that this means I've substituted a different five-letter thematic from the correct one - and generated a non-solution which the second step is designed to disambiguate - so more checking needed on my part...