bags issue fixes