Fixed broken zone check