Fix annoyance