more int2ext fixing