add patch from 4moms fork