Fix impatient message showing up in places it shouldn't