fixed poll, fixed listener