manual patch from master