DASHBOARD-71 - Fixed