Missing patch from previous commit...