Fix prepareId() only escaped first occur
Merge pull request #304 from hkdennis2k/master

Fix prepareId() only escaped first occur