Fixed placeholder bugs