corrected metadata handling (probably relies on #683)