Workaround for removed elements
Merge pull request #15 from cchantep/cchantep-removed-elmt

Workaround for removed elements