Fix it so we can be unloaded/loaded at will