@evilest-fiend: I have a fix