fix change handlers