Done some work on the zone state check, hopefully now it will be more reliable