Be more careful not to add the same picture multiple times (issue #223)