Fixup so it works on my box