Fixed bug which referenced obsolete elements