Fixed DATA_CONTAINER var not being cleared