Added missing fixup & removed wait loop from poll.
Merge pull request #416 from oliverschmidt/master

Added missing fixup & removed wait loop from poll.