hopefully fixing the rest of potential aborts, thx to a suggestion from fif