Al least not crashing anymore.