Bug Fix in Viewing Mode