fix some double-populating instances