DASHBOARD-34 - Fixed