Address fabricator fix