Actually, I've been working on a fix for the past hour or so.
Try this and see if it helps. As always, unzip the file, rename the YOUR_TEMPLATE folder to match your custom folder name then just upload the entire includes folder to your server.
Attachment 2410