Fixed Critical check