Fix a bug with the dual viewer
Merge branch 'dualview-fix'

* dualview-fix:
  Fix a bug with the dual viewer