(fix) #noticket Correct check