Fixing dashboard bug