Fix Metadata not being set