add missing patch from initial port