Fix address size issue