add more check