Add small condition for qucik status detection