Problem with built in drag and drop editor

I have found an issue with the drag and drop editor.

If you create a new template and add an Image and Caption block, edit it and change the settings to 2 images. Add images and text and click save and close.

Then do the same again with a new Image and Caption block below ( in the same content block ), edit it and change settings to 2 images again the system then copies the images and text from the first block. You can continue to edit it and change the images and text but if you save and close the new images and text are retained on the main preview but if you then edit the 2nd block the original images and text are shown on the right hand side editor.

Is there a way to fix this as it becomes difficult to know which images and text will be used when the campaign is sent.

*I am running the latest build, 1.7.2