Maybe fixing another crash