Fixed issue w/metadata