crash fix
merge
closes #1934
closes #2028