Fixed bugs with addresses