More fixes for placeholders
Test for #SCL-3385 Can't Reproduce