Fixes #2367 -- super in for-loop