finishing fixing #3581, with also simplified logic

git-svn-id: https://gnunet.org/svn/gnunet@34689 140774ce-b5e7-0310-ab8b-a85725594a96