Attempted a quick fix for the address scanning.  Did not work.