Fix multi object bug