fix errors
Merge branch 'fix-reach' into develop