Yes, lets wait on a fix for this until the JS is in place and we see what the options are.