Fix for multiple whitelist threads being started