Fix regression (8a651f135b95d3c534201142690ed7eed07ece85) causing unnecessary traffic (closes #162, #147)