add additional safety