Fixing bug with 1-poll interfaces