fix many-many-bug