added proper <original/> field, closing issue 6