missed two patches in last commit