Add a reminder for later about # 16 being broken