Fix rp sending too early