ScrollViewer Bugfix