upstream is almost ok