Added some addresses and fix infinite loop