merge fix
Merge branch 'steve'
fix crash
Merge branch 'steve'