Fix 2d eigenvalues code

Oliver Sanderrequested to merge
fix-2d-eigenvalues-code into master

This should also go into the 2.5 branch.

Merge request reports