fix the annoyance