Changed id behaviour according to Wiki