bug fix
test unloading