Fix for #1565. Added a couple of tests and fixed another issue with re-used placehold...