Added fix for eigen