Missed patch from my last commit