Clean-up bag fix