Hopefully prevented a bug from crashing certain devices