Making sure it works even if the final process fails
Fixing bad size calculation