fix
Merge pull request #585 from olga-jane/Crash559

Crash fix