Fixing baked badge issue