- addresses issue #1839
Merge pull request #1902 from aspidites/showcase_crash_fix

- addresses issue #1839