Fix the client tag at composer, again