Another fix for address type