Always gather metadata, fixes #235