Fix critical for issue with phones and tables