Metadata Extension: Bugfix #10 and #11