Changed a bit for consistency between v4 and v6