Dashboard fix

@mnzaki review
#346