Added fix for Eigen