Bugfix with manifest parsing