v2.7 - fixed zone avoidance