fix #1: swap enumeration and waiting for it's completion
Merge pull request #2 from klaernie/fix-suggest

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