Dashboard Bugfix