Made frame safety more comprehensive