Bag crash fix