fix rt #87309 : return .. or .. would never reach the "or" part