Resolve critical bug