Fix set change listener