eigen error fixed and merged