Resolve the bug in tools