Following a 20-month investigation, Facebook has signed a new, legally binding agreement with the state of Washington agreeing to remove advertisers’ ability to exclude races, religions, sexual orientations, and other protected classes in certain ad-targeting sectors. The Washington state attorney general’s office says the changes will be implemented nationwide, while the agreement will be legally binding in the state of Washington. Facebook has 90 days to fix its advertising platform to remove the unlawful targeting options and the social network service also will pay the Washington State Attorney General’s Office $90,000 in costs and fees.

Facebook’s ad-targeting tools were first highlighted in an investigative report from nonprofit ProPublica nearly two years ago. The report found that it was relatively easy to exclude certain races, languages, religion affiliations, and other categories from ads for housing, credit, employment, and insurance, despite this being a clear violation of the federal Fair Housing Act.

Facebook is still facing a lawsuit from civil rights groups alleging the social network enabled housing discrimination.