Add more safety