Merge "Fixed EIG creation"