Table addressing fix