Hello Roro
Excellent writing! I believe you are an advanced English learner, at least a learner much more advanced than me.
Anyway, what I feel about the problem you have now is that it rather come from your misunderstanding the tense relation in a sentence using the time connective word ....