Bugfix on ViewFinder