fix nested editing