Hopefully a fix from bags crashing