Partial fix for multiple tables