Master

Hopefully, this fixes your crash