Sub community bug fix