Fixed a bug with ID substitution (#15)