Fixed bug (missing tables from conditions)