master: fixed infinite loop error.