add more safety