OK changed this. Accepts more, but error messages are worse. I don't have a strong preference here.