Added a fix for matching table names