fix for view mode
Merge branch 'conversion' into testing