Fix for eigvals changes