Fix #5 (add/remove placeholders)