Second attempt at fixing peer control values.