Quick fix in check condition