Fixing a -T polling bug