Fixed: in-place editing