Fix for the last request here:

https://wordpressvip.zendesk.com/requests/19667