Better formfactor detection