fixes #943 thanks to @rwcarlsen.
Merge branch 'katyhuff-mvrx_segfault' into develop