new bug patch from master