fix multipoll, hopefully for the last time