Fixed cleanup exec