Fixed faulty relationships