Really fix the root cause of the exploit (hopefully)