Fixes npe missing metadata