Placeholder fix pt. 2