Improved fix for #199 so that manifest is only included if it exists