Fix for hardcoded table name