Fix possible AOOBE