Fixed table prefix issue