Merge "Fix a Bug in View Mode"