fix per community suggestions