Glinka's Nocturne in F minor fingering

[trus]

Hello people,
I wonder if could let me know your thoughts.  I am not sure what to do with the fingering in the right hand - see the picture, the second and third time bars right in the middle, coming up to Ff. See that G5, dotted and tied, if I hold it, as it supposed to be, using the pinky of the rh, then the grace notes before the a4 work out as fingers 1 and 2, then the a4 itself as 1 and g4 as 2.?? Awkward...  what do you think?
Thanks a lot.
trus