fix #1: swap enumeration and waiting for it's completion