Fixed DASHBOARD-344

Fixed DASHBOARD-344