Fix working_item implementation