Fix: hide ST2/ST3 differences a little better