Fix bug gang

Fix bug gang