removed address length check