Can we address this as a follow-up bug?