Fix changing zone bug