We're investigating a fix for this for the next Hotfix!