Pulling table view fix from Jesse