Fixing one thing bust another. I think I've fixed both now.