Fix the horribly broken unloading (or copy-paste screwup)