fixed passback check order