You are contradicting yourself. If you want to that nitpicky you should not treat the initial solution as 50 mM, as acid in it is dissociated too.
Just because in this case, the effect can not be ignored. 50mM was given, I assumed that was the real concentration.
Anyway, I will not post this kind of answer any more. Sorry for anything I have done which may not follow the forum's rule.