Updated to use R58. Fix for strict virgo flag.