fix potential routing issues in failsafe