add fix3 and fix4