Note I have a separate fix for this potential problem (I think).