fix rewrite issue
Merge branch 'gatherings'