If you think you can fix it, send us a Pull Request and I'm going to reopen the issue afterward. Looking forward to seeing your solution to this issue.