Merge pull request #847 from mihu/bind_zone_fix