Fixed the bug for dashboard