Bug fix (previously removing temporary directory even if it is needed afterwards)