BS-9819 Really fix extra pop-up when renaming diagram
- uncomment correction