Final fix for manifest