CAMSURV-3: Quick fix to Villages (still v1.6.3)