Heh, the original fix now doesn't work anymore, while my new fix does...