#5 fix with MANIFEST keys