Fixed addresses to remove empty elements