Need to fix going back crash after server adds table