Bug/eip class is too big #6350