CiviCRM 5.35.2 old issue of "Expected one Contribution but found 25" cropping up on gift imports

Hey

I am having a problem of the issue cropping up when doing new gift imports "Expected one Contribution but found 25".

From my research this error is an old one that was supposed to have been resolved on previous versions (4.7.20)? Is there a patch I can download or something I can do on the front end to resolve this issue? let me know if there are other people experiencing the same issue on this version number and how they managed to resolve the issue.

Any help on this will be much appreciated.

Kind regards,

Kian Shingler