326 - Fixing metadata core dependency