Fix crash when unloading

And put back the original label format