Fix recursive metadata
Merge pull request #1149 from erwinwinder/master

Fix recursive metadata