Geoff - fixed stop poll