Updated, fixed.

Need to test in a virtual machine more.