Leave it with me... I'll attempt to write a fix for this.