stole Laurel's table fix from navdash