Fixed badge issue