attempt to fix 4427

Hopefully also fixes "other" unit jitter.