Applied patch from official repo