Fix metadata, issue 555