Fixed crit issue