Fix Sophie B. crash
Merge pull request #1972 from bucketh3ad/fix_sophieb

Fix Sophie B. crash