Fixed bugs where thank you messages were proliferating