Really fixed polling logic