Fixed badge behaviour