I have no idea why 15 people decided it was important to repeat that it’s fine rather than answering your question.

Yes, when the phrase is ambiguous, it’s usually more coherent to simply change the sentence order as you’ve done here.