Fixes race condition in resources

See #1378.
Thinking of this relationship as a "group" the way it's currently done doesn't actually make a ton of sense to me in the first place, so I'm going to stand by calling this a "hack". Also, for the reason you said. :)