Further fix for WL per host