Fixed marshalling not passing manifest properly.