Bugfix - 'for' treating elements like a set due to caching