Applied patch from Ryan: