unloading on 3.5.4

requires more detailed handling