bag fix (stage 2, unstable)