Simple crash fix

Fixes #21