Fix Dashboard
Merge pull request #1435 from rog1121/patch-2

Fix Dashboard