Cleaning up. Fixing bug with addresses containing ':0:'