Are you ok with this patch, or do you want it as a separate pull?