Added a patch that Rod asked me to integrate in that I forgot.