add more format check