Badge Creation fixed