Fixes issue 12 (traffic limit)