Bug/fix eip switch on