This should now work ok.