Fix to allow less spam