fixes bugs with existing models & collections